Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 25 May 2010 11:10:15 +0000 (11:10 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 25 May 2010 11:10:15 +0000 (11:10 +0000)
commitf2e1b95d3ca17a71f11cd0c2f1c851618ce2125b
treef276770b5060cc2901ac18cc32e596fd0ab0d01d
parent2a77c33ad62fdf195c67d9e72daa937621a0400e
parenteeb0b429e22e41db29075e339a9395c8fb8a4f41
Merge from mainline.